Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 30 Jun 2011 17:47:53 +0000 (10:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 30 Jun 2011 17:47:53 +0000 (10:47 -0700)

Trivial merge